ee24a9a54bf58e8c2a2bca75cf321fafb1003878,reset-pass/account-validator-tool/src/java/org/sakaiproject/accountvalidator/tool/producers/ValidationProducer.java,ValidationProducer,fillComponents,#UIContainer#ViewParameters#ComponentChecker#,116

Before Change


					
			};
			
			UIMessage.make(tofill, "welcome1", "validate.welcome1", args);
			UIMessage.make(tofill, "welcome", "validate.welcome", args);
			UIMessage.make(tofill, "validate.imnew", "validate.imnew", args);
			

After Change


			};
			
			//is this a password reset?
			boolean isReset = false;
			if (va.getAccountStatus() == ValidationAccount.ACCOUNT_STATUS_PASSWORD_RESET) {
				isReset = true;
			}
			
			if (!isReset) {
				UIMessage.make(tofill, "welcome1", "validate.welcome1", args);
				UIMessage.make(tofill, "welcome", "validate.welcome", args);
				UIMessage.make(tofill, "validate.imnew", "validate.imnew", args);
				//merge form
				UIMessage.make(tofill, "validate.alreadyhave",  "validate.alreadyhave", args);
				
			} else {
				UIMessage.make(tofill, "welcome1", "validate.welcome1.reset", args);
				UIMessage.make(tofill, "welcome", "validate.welcome.reset", args);
				UIMessage.make(tofill, "validate.imnew", "validate.oneaccount", args);
				
				//merge form
				UIMessage.make(tofill, "validate.alreadyhave",  "validate.alreadyhave.reset", args);
			}